bitkeeper revision 1.1159.170.34 (419aad6416AhQtqf_9z4O_V7Cit8iQ)
authoriap10@labyrinth.cl.cam.ac.uk <iap10@labyrinth.cl.cam.ac.uk>
Wed, 17 Nov 2004 01:46:12 +0000 (01:46 +0000)
committeriap10@labyrinth.cl.cam.ac.uk <iap10@labyrinth.cl.cam.ac.uk>
Wed, 17 Nov 2004 01:46:12 +0000 (01:46 +0000)
Merge labyrinth.cl.cam.ac.uk:/auto/groups/xeno/BK/xen-2.0-testing.bk
into labyrinth.cl.cam.ac.uk:/auto/groups/xeno/BK/xen-unstable.bk


Trivial merge